优化 statistic_member

FFIB 4 年之前
父節點
當前提交
726633f4c8
共有 1 個文件被更改,包括 4 次插入6 次删除
  1. 4 6
      api/admin_views.py

+ 4 - 6
api/admin_views.py

@@ -528,13 +528,11 @@ def statistic_member(request):
528 528
 
529 529
     # 消费者统计
530 530
     if start_time and end_time:
531
-        users = ConsumeInfoSubmitLogInfo.objects.filter(ymd__gte=start_time, ymd__lte=end_time, test_user=False, dupload=False, status=True)
531
+        start_time = datetime.strptime(start_time, '%Y%m%d')
532
+        end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')
533
+        userinfos = UserInfo.objects.filter(resgister_at__range=(start_time, end_time))
532 534
     else:
533
-        users = ConsumeInfoSubmitLogInfo.objects.filter(test_user=False, dupload=False, status=True)
534
-
535
-    users = users.values_list('user_id', flat=True).distinct()
536
-
537
-    userinfos = UserInfo.objects.filter(user_id__in=users)
535
+        userinfos = UserInfo.objects.filter(test_user=False, level__gte=1, status=True)
538 536
 
539 537
     # 会员级别
540 538
     level_logs = list(userinfos.values('level').annotate(num=Count('user_id')))